From: Jan Beulich Date: Tue, 20 Jun 2017 12:51:53 +0000 (+0200) Subject: memory: don't suppress P2M update in populate_physmap() X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1960 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=b964e3106d2cdaa11cc4524181ff14607d110ae4;p=xen.git memory: don't suppress P2M update in populate_physmap() Commit d18627583d ("memory: don't hand MFN info to translated guests") wrongly added a null-handle check there - just like stated in its description for memory_exchange(), the array is also an input for populate_physmap() (and hence can't reasonably be null). I have no idea how I've managed to overlook this. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff --git a/xen/common/memory.c b/xen/common/memory.c index 12296d76c7..09d329da0f 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -248,8 +248,7 @@ static void populate_physmap(struct memop_args *a) guest_physmap_add_page(d, _gfn(gpfn), _mfn(mfn), a->extent_order); - if ( !paging_mode_translate(d) && - !guest_handle_is_null(a->extent_list) ) + if ( !paging_mode_translate(d) ) { for ( j = 0; j < (1U << a->extent_order); j++ ) set_gpfn_from_mfn(mfn + j, gpfn + j);